Several code quality fixes
Start on post options