Update contributing, bug fixes