Some more improvements and refinements