update to 1.007b

Code cleanup