some bugfixing and examples