Fixed errors, clean build
Merged Justin's fixed into master