Typo fix
Initial commit
Bug fixes, refactoring