Maintenance

Numerous tiny changes, mostly of interest for developers, like moving many functions to private. Fixed some very rare events sequences causing uncomfortable results with GUI.