Some small fixes and refinements. No major changes to functionality. This version is live