Fixed uhh.... stuff