removed swap file
added more detail to error message
switched back to allowing any project id
removed fields that weren't in testing DB