First commit after a long time, major updates everywhere.