Axisimprovements

Apply axis improvements branch