fixed micro bugs