bug fix
validate/handle more data types