Bug fixes and base controller imported into package