added "r" to regex search
updated todo finished 1