some fixes, i think