fix comments, mostly indentation
move libraries from list of targets