fixed build and dependency errors. fixed style