Various updates from debugging the cape