More cleanup

Setting proper debugging levels, cleaning up things, etc.