more fixes
final
fresh