some fixes & adding Axis