Finalizing

Making last few changes