Changed a few small things based on feedback from Nic.