Various bug fixes
added link to forum thread
Merge pull request #395 from Thequietcroc/master

Various bug fixes