few fixes, it works now