Code Fixes & Revision_2