Fixed stuff
Merged with Graham