continue to work on speccing out using an origin x/y value that come from params...  This isn't accurate, but i wanted to check something in.
minor cleanup
adding in some more cleanups as i try to get back to baseline