fixes -- almost done