fixed a few things, because they were weird. And added other small things, oh and played with enum but that didnt work out