Pull request for the fixing of obscure issues

Yay, updates and fixing and such