fixed sync issues, only thing left is contentobserver & fixing views