*more optmizations

and more under way...