update to reflect feesh's changes. since these are living outside of version control these may not be 100% correct but I think this accounts for all of the changes.