Corrections and adjusted to also build and include debug files
changes to current standards