Unbelievably huge commit: added tons of features, fixed tons of bugs