Add comments and other minor changes