worked on a few things
added orderby