some updates on what's going on
more fixes