Updates & Fixes after public review