Fix bugs; update versions