- added a complex administration module

- cleaned up some code