Revert all my changes back to old branch

this reverts all my changes 
and maes the source useable again ;)