all fixes in place