Adjusted Alot

Adjusted Some more stuff
Added partial support for jammer