some changes that were lying around on my local. no sure what they were
merge problem