bug fix part 1
bug fixes part 2
merge conflict are soooo fun
fixing stupid stuff
okay