Some minor bug fixes. Still bug when using numbers.