fixed logging, changed some class names