some bugfixing and new questions