Varioux fixes and cleaning up.