minor updates, still WIP