More stuffs added and fixed