1.0.0.3d (Even more Refactoring/Housekeeping)

see previous commit