some fixes, lol