Add multiple small code additions and improvements

Add multiple small code additions and improvements #372