More small changes

I think I fucked something up, will return later