update and fixes - 0.37b