forum changes
more stuff
I have no clue what I'm doing
fixed merging conflicts