Comment
Remove glob stuff, not done yet
Small changes