Muchos code tidying

get more sample data
