Minor Fixes to codes,header and various layout