Improved admin and other changes
fixed tests