several fixes closer to the final release