minor fixes, some editor programming