various fixes/models