More complete update to pheed branch