some fixes and auth-support