Small changes and setup /update