tons of bug fixes