fixing so many things