Improved agenda, now also parses current file if it's a dotoo file