slight changes
added some stuff
merged