Some errors seem to have slipped through, with rebasing I think. Should've tested that again before merging