small changes and build