fixed more issues

down to 120 or so