- various bug fixed