update for 6.1 final, use String instead of NSString where possible, move unwrapping up one and other code cleanup
update for 6.1 final, code cleanup, preview both txt and pdf