Cleanup, fix "no perms" message, and proper comparisons