Comments and thoughts

Final changes just synced. Just comments catching up with the rest of
the program.