Fixed some errors I didn't catch because of a bad .project file in
eclipse.