Initial commit
Bug fixes