Additions/fixes to barbarella.