a couple updates to fix wierd bugs