Issue93

Addresses Issues 93 and 98; both of which are very minor.