Minor fixed and additions