tons of bugfixes and experimental features