fix while stmt, add return stmn