moved shit...fixed shit