Repair bugs; update README