Some bug fixes and fleshed out the dictionary more.