Documentation upgrade + bug correction