Fixed few mistakes, fixes #28