fixed multiple things