Some Fixes to Design & Code