some prettying up. Needs more