More stuffs!

Clear won't work on my path, have modifications to do for that to
happen.