Better log output and more semicolons