Performance and hawk options

Closes #879 #871