Adding some more misc stuff