misc additions and improvements