Rationalize the permissions system.<br />Bug fixes