fixed modal and added map for later init