added resync functionality and some notes