Added simple logging and other