updating with bug fixes