Fixing the stuff.
Merge branch 'jake'