major face lift!  Also refactored several things.