Added misc other stuff