upcycling & bugfixes (ref #229