Some more stuff added; corrections