minor improvements, need to move list to spreadsheet