added a ton of stuff
merged changes