fixed more things