Updated:

Resolved issues and added potential fixes