Beginning our minor edits and bug fixes, just syncing up