JD's bugfixes all sent