Improve Makefile, make way for s3.