date bug and error annotation fix. Closes #217 closes #277