clean up, comments; bug with "axis" line