tons of fixes, should all work now