bugfixes, added infra