General cleanup. Added --number option to number lines