More "fixes" for the PR
Should fix Demoshield bugginess
-Also getting close to #13 :)