Fix stuff, will change later