Made some small changes
pulled, merged, resolved some conflicts