(#393) - A few touch ups