minor bug fixes and refresh forced