Finalizing

Made a few changes.