some fixes, global solution