More minor fixes & improvements
Reminders for future improvements