a bunch of changes. wanted joe to be able to see src in case it helps his work