name change and some bugfixes