Some more related work and some small fixes