Changed expr to accept argument, among a few other little things