first batch of changes

Made by Sean