bugfixes + experiments