Patched up some cool stuffs.