few corrections & push to test with cloud9