More additions, corrections