infinote testing and bugfixes