Added lightyears; small changes