small changes, still in progress