updates; fixed and merge