buncha fixes