Initial commit
fixed minor issues