added console and generic cleanup