moved models back to being a file
switched to mixin style for duration distribution derivatives
tweaked comment