Additional updates

Made a variety of updates