Reworking of some things to allow for stable easy development
Added the correct branch
added southwest
fixed merge conflicts