Add key moments, minor improvements