Performed minor fixes, push to site for Client feedback