some fix based on user feedback