Improvements and fixes

Added new options. Modified result showing behaviour. Other small fixes.