some bugfixes and support for solitaire nodes