Minor changes

Added some admin functionality
Minor changes
Some bugfixes