massive update with various new features and improvements