Bug Fxes & Optimistaion

Bug Fxes & Optimistaion