add display and misc other changes