Added debugging helpers
Updated project files