removed some redundant stuff & small fixes