some updates, fixed REST issues.