case sensitive issues and little improvements