Comments, tidying up and small fixes