Minor fixes on dislocator and build tool, fancy new build script commits stuff too