Made various changes