signature, bug fixes