Fixes and additions

Path errors, wrong function names and dependencies missing: Fixed