Bug fixes and additional comments (P.Skowronski)

No match.