PiBrella syntax changes and bug-fixes