various fixes, still wip though