Smarter prob. calculations and better formatting