minor updates, thanks to D. Vallendor