added somefixes
use new dist system