small changes, bug fixes