bunch of tweaks and improvements