Updates

Added rtrim on a lot of base tables