misc. changes and started adding tool support