some bugfixes and clarify behaviour