Fixing concat and final touches on build system