style and script improvemenets