More tweaks.

Big merge soon...