more testing, more corrections