Hyphen tweaks + stuff