tons of fixes
final changes for now