-Further fix of #159 -ok, a few pieces were still missing... or dangling. Fixed and appears to run properly.