results of a major netbeans inspect & transform
continuing fixes