organizational changes, bug fixes