fixed submission issues