bug fixes mostly