Made various minor improvements