some changes

hopefully no merge errers