Redo+cleanup

title says it all; last version was notably less endowed, as was mentioned by some of ya. Hopefully this version is more up to par:)