Fixed bugs, missing dependencies...