Seems to me like you have the basics covered. A lot depends on the situation/s and location/s your designing your kit for.