Minor changes, renaming and commenting
Train debugger added