Fixed thunder, compacter and cleanup#1

jgandert wants to merge 2 commits into

TheWebmage:masterTheWebmage/commands-json:masterfrom

jgandert:masterCopy head branch name to clipboard