some wip changes
some additional changes...