fix and stuffs. need more test on aws... maybe drop the project on the master...