Minor Tweaks and Finalisation

2 minor changes