added misc other stuff