"Unfixed" some things :-). cleaned up and made some of the namespace changes more...