General adds and fixes.