Initial commit
some fixes