added Ghost, minor fixes in other classes