resolve a bunch of issues