BUG: fixed import misses and such