improvements and refactoring
added the station control axiom builder, minor changes