Bug fixes mostly- see main codebase