- overall fine tuning and improvements