* few optical tweaks - will now merge back