More testing; tweaking; implementing get_record