Fixed some shit I broke in the last commit