improve docker startup and images