fixed loads of stuff