Done for the night, small changes