lots of bug fixes today!