fix bugs posted by others
merging