Improvements by @talko

Improvements by @talko