After submit fixes

Fixes #75. Fixes #73. Fixes #77. Fixes #76.