Few changes, but still many bugs.