Fix memory leak, small cleanups
Merge branch 'master' of https://github.com/Xinxe4/wurdklok