Small debug

Including Jeremy edits and compile debug