Couple of bufgix and adding support for new controls