Hardware Sync Nearly Complete

- polishing other stuff as well