Bugs and typos fixed. Allowing one letter names.