Added admin option, minor bugfixes.