Initial commit from changed project
Some error fixes