cleaned up code, fixed observatory id