miserman
merge fixes