cleanup permissions, minor options update