Fixed minor fixes submit etc