Massive update, tweaks, fixes, aesthetics