some more quick changes
fixed minor issues