Minor fixes and couple of new scripts.