Fixed some oversights, moar progress