Various cleanup/logging
Minor syntax errors