Cleaned up parameter handling and made sure exhibit was used throughout