Bug fixes & refinements.