basic admin and bugfix