updated specs and test and some minor ui chages