few updates basic wip