cleaned retarded shit + fixed some