Added minor logging capabilities and minor bug fixes

## Ready State: Yes