some fixes, last tinymaps support