Whole buncha fixes!