fixed issues
more fixes
dsgagsd