Patches for new admin settings page, various bug fixes.