fixes
final fixes (hopefully)