misc additions and changes