eteran lots of small tweaks and optimizations