-minor changes, bug fixes