Added little improvements.