Bug fixes, still more to go