Functionality improvements and updated code for PolyScript 2.0