Lots of little things

These should all be safe.