Minor updates && type set