in the middle of fixing some CCP bugs

Bug #1 from bug list