Final File Merge

Final bug fixes and changes.