A few corrections and adjustments, nothing too much important