Couple more misc. changes
Even more changes! :D