lots of bugs fixed; refactoring
Merge branch 'master' of https://github.com/simbajoe/admiral