Fixed an undefined assignment and started on 3 issues