Micro-opts and fixes in comments
Added self.sat and improved tests