Fixing semantic errors + fleshing out content