fixed a few issues in spec & UI