Tons of small tweaks and improvements