More tweakings.. Done for tonight!