Duncan's bugfixes/work

Don't merge yet, working on this for wework app