so many bug fixes