various updates. still WIP