Removing heroku from build and fixing up general errors