Fixed wtf issues...