Fixed last mistakes and clarified things