Refinements and bugfixes
Refinements and bugfixes