fixed a lot of refactoring typos & mistakes

while testing with node-mvp