fixed hyphenation (go functional!) and plugging in better proportional shifting