Removed debug code from main
Basic self diagnostics