Linted the hell out of everything and fixed a bug.