initial commit
fixed bugs