update with bug fixes