Nitpicking updates/testing