Improve Docker and make file