Bug fixing; Made base more explicit