fixign some stuff