some adjustments
added toolkit js