Fixed axis numbers updating with changed axis values. Also removed commented out code