various fixes/updates