Removed compiler errors. main.cc still broken.