Small changes, nothing fixed yet