Version 2.00: little fixes and code cosmetics