- many bug fixes