updates to build and main