Many changes

Updates over the weekend.
Why not just remove it instead of commenting it?