A few more changes/additions

Editing references, class tweaks