fix compile errors and remove badass Governor