Pull request to fix major errors

Shwoops.