update style and bug fixing