* some more polishing of the code base