Alpha test looks good

Everything works and I made a few changes to address tester comments