Fixed errors in PFB adding, etc more tests to come