plugin - api cleanup
server - timer improve and bug fix