take full advantage of bundle, fix bug #4 and #5