Added new stuff to take care of issues 1-3

It also takes care of part of issue 4...but I don't really consider that
done.