Modifying docs, modifying code also a little bit.