More making things pretty and faster