Authenticated services + general cleanup for Beta 3