fixed other things