Complete Plymouth integration. Fix the last set of minor bugs