a few fixes, some stuff didn't get moved over