Ninth Commit

Some strange stuff happened, I tried to fix it, and I'm not sure that I
succeeded. (specifically for onCommand - CommandListener.java)