Rest of last commit

(I forgot to save before commiting) :p