Attempts to fix some errors when failing to get a full dataset. Some issues still remain.
Moves windows slightly for better alignment.