some fixes

fix some bugs, move unnecessary test-code to the clipboard.txt file