Added fixes for complete commands.java :)