modified some small things..