clean up comment handling, still a bug in assignment