Corrected my comments per Sam's update to i69
Merge branch 'dev' of github.com:tarwich/jackal into dev