Cosmetic Fixes + Checkpoint