Hopefully fixed lots of stuff