Made several updates