added and fixed some stuffs
added and fixed some stuffs