first commit
fix problems