a few fixes
wooooooah
finally working