improved scripts and Dockerfile