minor cleanings and fixes