Tidied up comments and added admin tools