Fine Tuning

- Making everything work smoothly.