Fixed boolean model
Improved plotting