added some stuff
merged matts changes