added default tokens and updated comments