Fixed bug where names could not contain characters such as "-". Also