Fixed more bugs; fixed hardcoded paths.