Merged obj, fixed some bugs.