fixed errors from merging branch, I didn't have a gui diff tool :(