little fixes and script updates