More work

Stuff fixed during out meeting