many changes - mostly usable now