Adding resync, auto device check, and better handling