initial commit
fixed issues with initial commit