bugs fixed
option page updated