Fix for #13 and #14. Fix for capitals on location and for null descriptions