Additional notes, plus updates on code structure