Bug fixes according to document

Remarks given in a document since March 2014