updated build system some more