add damianos suggestions
 first improvements
more improvements