bug fixes + remove unnecessary imports + small aditions