Fix trigger error.
Move comments to where they should be.
Fix bug in non-clearing success messages