a variety of fixes before beta