Version 1.08: fixes and cosmetics