Initial commit
fix bugsa