Tristan add statricks

Statricks cleanup/polish. QA welcome...