Various small changes; created Axis class