Final touches to build system. Should be last and final commit till later.