Minor fixes and prettying up