updates with bug fixes