More changes (can't remember all of them, see commits)