fixed too other things