Corrected more things

(that probably shouldn't have been broken)