Cleaned up. Removed deprecated function calls. Added multiple word definitions.