Added/improved build scripts