added clear buttons, some new stuff