Bug fixes, templated info window