more refactoring
save letter
bugs