20140920 - More fixes to the cyclotron