renamed scripts, added units