large update with new strategies and all-round improvements
lost changes