updates, still quite a few small bugs and details to work out