Adding in admin commands and fixing bugs