fixed few more things