Bug fixes and admin interface implemented