small refactorings, container to run on port 9000