Made small changes to everything