fix

fixed some stuff in the wrong place