fixed stuff from feedback from jamie.
merged stuff
merged stuff