Add some more comments
Re-enable clipping which was accidentally removed