Minor changes

Use fscanf instead of cin
Use macro instad of char array
Add some TODO's