Overall fixes and improvements