Solve issues from original repo

• #7
• #8
• #9
• #14
• #19
• #21