bug fixes all over everywhere