more build system implementation and changes