Initial commit
Few fixs