fixed imports and general bugs