Fix things, split stuff up a bit