mass update

with fix of force closes (some options). On compile got lot of force
closes and now fixed