small fixes and fixed git merge stuff which was kinda wtf but ok never mend