added misc stuff