Minor bug fixes and a lot of functionality changes as I respec the admin side of things