Fixes, logging tweaks, cleanup (Now agaisnt the correct branch)

[Drapersniper]

Cleanup a bit of the code to simplify it,

Reduce the cog spam at the DEBUG logging level

A few Fixes

A few enhancements

[aikaterna]

Hey there, we'll work on this in the future, this is going to be autoclosed due to how I want to handle my Red 3.5 stuff.