Fixed SUBMIT command + added more keywords