Fixed some stuff that did not get included in the last commit for some odd reason.