added pioneer and fixed some bugs