More stuff, checks and fixes