Updated few less important variables :D