minor changes on submission behavior