refinements and cleared bugs