commit some changes from clean_up branch