minor addons & updated version