minor import & indentation bugfixes. Some dependencies figured out