Some small typo and bugfixes