Fixed a few bugs; updated to track rust/incoming