New permission functionality...
Minor bug changes...