Change Set 1

Just made some improvements in general. Nothing different just changed
how a few things are done.