Diverse updates some bug fixes