little fixes and better speed time benefits