improved slightly. Debugging still broken
fixed make process not compiling debug versions