More fixes and improvements...