A few fixes, and prepping for shawn to do stuff