Bug fixes and cleanup. Added bigger dictionary
Added larger dicitonary, bug fixes and cleanup. removed global dependancy