bugfixes + util working