Minor bug fixes and improved admin module.