Pberezka/issues fixes

fixes for issues:

• #38 (closed)
• #40 (closed)
• #46 (closed)
• #47 (closed)
• #48 (closed)
• #51 (closed)
• #54 (closed)
• #68 (closed)
• #69 (closed)