build stuff and fixes