clean up, bug fixes (remove btns), functions, etc.