Stabs in the dark for deployment
Fixed build issues and a couple bugs, updated README, cleaned up whitespace