Banbaro fixes and some more options