little tweaks and add a legacy mode for me