ft. many improvements, still repairing tests