reshapes and bug fixes bedore dev meeting