Fixes and improvements...