Added some TODOs, cleaned up Maven build process.