Bug fixes, more to do