ready all fixes