massive updates - bug fixes