Looking good can't wait to see this.
Ref crank angles, you still using the previous map for this engine? if so then it's just a case of using a timing gun enter the value the light flashes same time as TDC mark passes enter the value into WARI wizard and it will do the rest for you