Small bug fixes, mostly in private variable declaration.
Merge pull request #394 from CorruptedHeart/BugFixes

Small bug fixes, mostly in private variable declaration.