Fixing bugs and adding Guice annotations