Add various improvements: Part 2