various massive updates