fixing some errors and start integrating with node-organic