More misc additions