adjust podspac and fix bugs