Some fixes -- still doing testing.