all fixes!