some problems fixed need to work on sorting