Solve issues from original repo

• #1
• #2
• #3
• #4
• #5