minor bug fixes and data additions/deletions