fixed, added, scripted many things