random updates and fixes