Comments and Fixes