added constants, fixed up admin cp