some fixes, it works now