Code cleanup / Stabilization efforts

No new features, just getting things stabilized...