Typed up diary + bug fixes