fixes some errors
fixes some errors
clean up
clean up
simplification of deq