bug fixes for one and all