small changes
merged monday morning- Chris fixed bug
random changes