fix a bunch of issues...