some cleanup and minor spiral improvements