Some tidyups, re-enable tcltk