Final changes before build, good night