filename fixes, removed incomplete mixin