alot of fixes, it works now