More additions and improvements