Some new things and an edit