Updated with fixed minor issues