updated logging, renamed some core objects