Big 'ol batch of bug fixes!