+more bug fixes