Several Bug Fixes

some admin level bug fixes to RC2, going to wait for feedback till I put
out RC3