changed some stuff around to get ready for devel merge

author: nhhughes