[develop] done some more polishing