some fixes, maybe...