more utilities, bugfixes