script and git fixes