More responsive tweaks, some code clean up