[technical commit, some bugfixes]