Another set of minor improvements.
XD. I couldn't get solid.tk, so...

Renaming spree!!! lol