Fixed up several bugs, resyncing live edits with sourcetree