re-enabled +1 for new submissions, more cosmetic changes