renamed constants to less c like. various minor changes