nick - misc additions / changes