Fixing a bunch of option passing, correctly handling perms and content types