Some 'cleaner' is_public changes...
Fixing some specs and the like