Bugfixes and refinements
Bugfixes and refinements