Fixing bugs and moving things
Patches inert keys not being fired
Javadoc for API
Merge branch 'dev'