Fixed/Added some stuffs