Further 913 fixes and debug inserts, which I thought I'd already made....sourcetree is being buggy.