Merge pull request #1261 from Arantor/release-2.1

More cleanup
Merge pull request #1262 from Arantor/release-2.1

Stuff
! Missing global variables can do weird things (fixes #1223)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1263 from Oldiesmann/release-2.1

! Missing global variables can do weird things (fixes #1223)