Removed singleton pattern
Update to comments
Added missing error handler call.
Project file updates