minor advances
tons of bug fixes