First commit
Fix some errors