Some cleanups and listen to deck for transition changes