cleanup and fix build install