bug fixes added