Minor tweeks & polishing