Fixed stupid more bugs.