removed a bit of old code and added better dash and underbar handling