updaing with bug fixes