first commit

resolves the minor issues