Fixes #143 and Fixes #144

Still relies upon a database update..