a set of bugs fixed