submission counter fix and some other little things