Minor updates, bug fixes.
Minor updates.