added std::addressof and fixed some intendations.