Strip language stuff and squash bugs