fixed imports, added comments