some fixes, not working yet