Updated misc stuff