Changes to company and job per Andrew; minor bug fixes.