Miscellaneous changes and silly mistakes.