lots of updates, new haiku