Some cleaning up of global variable space, setup process
Fixed event add forms
Progress commmit: changing lots of identifier and function names