just syncing
fixes & preparing for indicator support