lotsa improvements