wip: main improvements regarding basic function