New version: various fixes and new mini basket type