Some fixes
Merge pull request #276 from Acconut/patch-1

Some fixes and missing chars