Fix to misplaced text line + more comments